Add versioning to display_vecs for future improvements.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 77970284f12f910bb85899b6d12a44137a258db1..2c0cdb07fe3552a6d4cada41a5a8ffca3e88583a 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -273,12 +273,12 @@ void fatal(const char *, ...)
 
 ff_vecs_t *find_vec(char *, char **);
 void disp_vecs(void);
-void disp_formats(void);
+void disp_formats(int version);
 void printposn(const coord *c, int is_lat);
 
 filter_vecs_t * find_filter_vec(char *, char **);
 void free_filter_vec(filter_vecs_t *);
-void disp_filters(void);
+void disp_filters(int version);
 void disp_filter_vecs(void);
 
 #ifndef DEBUG_MEM

diff --git a/gpsbabel/filter_vecs.c b/gpsbabel/filter_vecs.c
index 3f87a8700ae0a7e14c91a4cf5831eca983b7ea4a..6b57e405164eece69e7b7190bce49b655e809768 100644 (file)
--- a/gpsbabel/filter_vecs.c
+++ b/gpsbabel/filter_vecs.c
@@ -127,10 +127,17 @@ disp_filter_vecs(void)
  *  determine what formats are supported.
  */
 void
-disp_filters(void)
+disp_filters(int version)
 {
        fl_vecs_t *vec;
-       for (vec = filter_vec_list; vec->vec; vec++) {
-               printf("%s\t%s\n", vec->name, vec->desc);
+
+       switch(version) {
+       case 0:
+               for (vec = filter_vec_list; vec->vec; vec++) {
+                       printf("%s\t%s\n", vec->name, vec->desc);
+               }
+               break;
+       default:
+               ;
        }
 }

diff --git a/gpsbabel/main.c b/gpsbabel/main.c
index 4c5d9bb2063d44dd17b399b5954277608e49ef9c..57c0a235fb881fd99c457e7b0d19d893f2f1964c 100644 (file)
--- a/gpsbabel/main.c
+++ b/gpsbabel/main.c
@@ -75,6 +75,7 @@ main(int argc, char *argv[])
        char *ivec_opts = NULL;
        char *ovec_opts = NULL;
        char *fvec_opts = NULL;
+       int opt_version = 0;
 
        global_opts.objective = wptdata;
 
@@ -110,6 +111,10 @@ main(int argc, char *argv[])
 
                c = argv[argn][1];
 
+               if (argv[argn][2]) {
+                       opt_version = atoi(&argv[argn][2]);
+               }
+
                switch (c) {
                        case 'i': 
                                optarg = argv[argn][2]
@@ -176,10 +181,10 @@ main(int argc, char *argv[])
                                 * this as -^^.
                                 */
                        case '^':
-                               disp_formats();
+                               disp_formats(opt_version);
                                exit(0);
                        case '%':
-                               disp_filters();
+                               disp_filters(opt_version);
                                exit(0);
                        case 'h':
                        case '?':

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index fb7c61c51f7c6eca677d8b6753f38400d3a0c799..9540dcc7089fa1da2739e73f45203ae12e4719c8 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -335,19 +335,25 @@ disp_vecs(void)
  *  determine what formats are supported.
  */
 void
-disp_formats(void)
+disp_formats(int version)
 {
        vecs_t *vec;
        style_vecs_t *svec;
 
-       for (vec = vec_list; vec->vec; vec++) {
-               printf("%s\t%s\t%s\n", vec->name, 
-                       vec->extension? vec->extension : "", 
-                       vec->desc);
-       }
-       for (svec = style_list; svec->name; svec++) {
-               xcsv_read_internal_style(svec->style_buf);
-               printf("%s\t%s\t%s\n", svec->name, xcsv_file.extension ? 
-                       xcsv_file.extension : "", xcsv_file.description);
+       switch(version) {
+       case 0:
+               for (vec = vec_list; vec->vec; vec++) {
+                       printf("%s\t%s\t%s\n", vec->name, 
+                               vec->extension? vec->extension : "", 
+                               vec->desc);
+               }
+               for (svec = style_list; svec->name; svec++) {
+                       xcsv_read_internal_style(svec->style_buf);
+                       printf("%s\t%s\t%s\n", svec->name, xcsv_file.extension ? 
+                               xcsv_file.extension : "", xcsv_file.description);
+               }
+               break;
+       default:
+               ;
        }
 }